auto upstream

author Joakim Verona <joakim@verona.se>

Sun, 17 Feb 2013 23:04:31 +0000 (00:04 +0100)

committer Joakim Verona <joakim@verona.se>

Sun, 17 Feb 2013 23:04:31 +0000 (00:04 +0100)
author Joakim Verona <joakim@verona.se>
Sun, 17 Feb 2013 23:04:31 +0000 (00:04 +0100)
committer Joakim Verona <joakim@verona.se>
Sun, 17 Feb 2013 23:04:31 +0000 (00:04 +0100)
diff --cc src/keyboard.c
Simple merge
diff --cc src/xdisp.c
Simple merge
diff --cc src/xterm.c
Simple merge
author	Joakim Verona <joakim@verona.se>
	Sun, 17 Feb 2013 23:04:31 +0000 (00:04 +0100)
committer	Joakim Verona <joakim@verona.se>
	Sun, 17 Feb 2013 23:04:31 +0000 (00:04 +0100)
		1	2
src/keyboard.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/xdisp.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/xterm.c	patch \|	diff1 \|	diff2 \|	blob \| history